diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 35707a6..ff2f7d2 100644
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -18,7 +18,7 @@
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7794-alt-u-boot"
 CONFIG_SPL_TEXT_BASE=0xe6300000
-CONFIG_ARCH_RMOBILE_BOARD_STRING="Alt"
+CONFIG_ARCH_RENESAS_BOARD_STRING="Alt"
 CONFIG_R8A7794=y
 CONFIG_TARGET_ALT=y
 CONFIG_SYS_MONITOR_LEN=262144
diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index f328af8..d8c0f78 100644
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@@ -13,7 +13,7 @@
 CONFIG_ENV_SECT_SIZE=0x40000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot"
-CONFIG_ARCH_RMOBILE_BOARD_STRING="Blanche"
+CONFIG_ARCH_RENESAS_BOARD_STRING="Blanche"
 CONFIG_R8A7792=y
 CONFIG_TARGET_BLANCHE=y
 CONFIG_SYS_MONITOR_LEN=262144
diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index 92bb591..6f2a015 100644
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -18,7 +18,7 @@
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7793-gose-u-boot"
 CONFIG_SPL_TEXT_BASE=0xe6300000
-CONFIG_ARCH_RMOBILE_BOARD_STRING="Gose"
+CONFIG_ARCH_RENESAS_BOARD_STRING="Gose"
 CONFIG_R8A7793=y
 CONFIG_TARGET_GOSE=y
 CONFIG_SYS_MONITOR_LEN=262144
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index 8d9c3b9..37511f8 100644
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -18,7 +18,7 @@
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7791-koelsch-u-boot"
 CONFIG_SPL_TEXT_BASE=0xe6300000
-CONFIG_ARCH_RMOBILE_BOARD_STRING="Koelsch"
+CONFIG_ARCH_RENESAS_BOARD_STRING="Koelsch"
 CONFIG_R8A7791=y
 CONFIG_TARGET_KOELSCH=y
 CONFIG_SYS_MONITOR_LEN=262144
diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index d00314c..30582bf 100644
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -18,7 +18,7 @@
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7790-lager-u-boot"
 CONFIG_SPL_TEXT_BASE=0xe6300000
-CONFIG_ARCH_RMOBILE_BOARD_STRING="Lager"
+CONFIG_ARCH_RENESAS_BOARD_STRING="Lager"
 CONFIG_R8A7790=y
 CONFIG_TARGET_LAGER=y
 CONFIG_SYS_MONITOR_LEN=262144
diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index a343c8e..2f4f03d 100644
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -18,7 +18,7 @@
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7791-porter-u-boot"
 CONFIG_SPL_TEXT_BASE=0xe6300000
-CONFIG_ARCH_RMOBILE_BOARD_STRING="Porter"
+CONFIG_ARCH_RENESAS_BOARD_STRING="Porter"
 CONFIG_R8A7791=y
 CONFIG_TARGET_PORTER=y
 CONFIG_SYS_MONITOR_LEN=262144
diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 5f08ae0..e0ed90f 100644
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -18,7 +18,7 @@
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk-u-boot"
 CONFIG_SPL_TEXT_BASE=0xe6300000
-CONFIG_ARCH_RMOBILE_BOARD_STRING="Silk"
+CONFIG_ARCH_RENESAS_BOARD_STRING="Silk"
 CONFIG_R8A7794=y
 CONFIG_TARGET_SILK=y
 CONFIG_SYS_MONITOR_LEN=262144
diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index 0375630..9f5c61d 100644
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -18,7 +18,7 @@
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="r8a7790-stout-u-boot"
 CONFIG_SPL_TEXT_BASE=0xe6300000
-CONFIG_ARCH_RMOBILE_BOARD_STRING="Stout"
+CONFIG_ARCH_RENESAS_BOARD_STRING="Stout"
 CONFIG_R8A7790=y
 CONFIG_TARGET_STOUT=y
 CONFIG_SYS_MONITOR_LEN=262144